$OpenBSD: patch-common_include_zarafa_charset_traits_h,v 1.2 2016/04/20 18:38:41 robert Exp $
--- common/include/zarafa/charset/traits.h.orig	Wed Apr 20 13:13:54 2016
+++ common/include/zarafa/charset/traits.h	Wed Apr 20 19:54:13 2016
@@ -81,31 +81,31 @@ class iconv_charset<const char *> _zcp_final { (public
 	}
 };
 
-template <size_t _N>
-class iconv_charset<char[_N]> _zcp_final {
+template <size_t _ZCPN>
+class iconv_charset<char[_ZCPN]> _zcp_final {
 public:
 	static const char *name() {
 		return CHARSET_CHAR;	// Current locale
 	}
-	static const char *rawptr(const char (&from) [_N]) {
+	static const char *rawptr(const char (&from) [_ZCPN]) {
 		return from;
 	}
-	static size_t rawsize(const char (&) [_N]) {
-		return _N - 1;
+	static size_t rawsize(const char (&) [_ZCPN]) {
+		return _ZCPN - 1;
 	}
 };
 
-template <size_t _N>
-class iconv_charset<const char[_N]> _zcp_final {
+template <size_t _ZCPN>
+class iconv_charset<const char[_ZCPN]> _zcp_final {
 public:
 	static const char *name() {
 		return CHARSET_CHAR;	// Current locale
 	}
-	static const char *rawptr(const char (&from) [_N]) {
+	static const char *rawptr(const char (&from) [_ZCPN]) {
 		return from;
 	}
-	static size_t rawsize(const char (&) [_N]) {
-		return _N - 1;
+	static size_t rawsize(const char (&) [_ZCPN]) {
+		return _ZCPN - 1;
 	}
 };
 
@@ -153,31 +153,31 @@ class iconv_charset<const wchar_t *> _zcp_final { (pub
 	}
 };
 
-template <size_t _N>
-class iconv_charset<wchar_t[_N]> _zcp_final {
+template <size_t _ZCPN>
+class iconv_charset<wchar_t[_ZCPN]> _zcp_final {
 public:
 	static const char *name() {
 		return CHARSET_WCHAR;	// Current locale
 	}
-	static const char *rawptr(const wchar_t (&from) [_N]) {
+	static const char *rawptr(const wchar_t (&from) [_ZCPN]) {
 		return reinterpret_cast<const char*>(from);
 	}
-	static size_t rawsize(const wchar_t (&) [_N]) {
-		return (_N - 1) * sizeof(wchar_t);
+	static size_t rawsize(const wchar_t (&) [_ZCPN]) {
+		return (_ZCPN - 1) * sizeof(wchar_t);
 	}
 };
 
-template <size_t _N>
-class iconv_charset<const wchar_t[_N]> _zcp_final {
+template <size_t _ZCPN>
+class iconv_charset<const wchar_t[_ZCPN]> _zcp_final {
 public:
 	static const char *name() {
 		return CHARSET_WCHAR;	// Current locale
 	}
-	static const char *rawptr(const wchar_t (&from) [_N]) {
+	static const char *rawptr(const wchar_t (&from) [_ZCPN]) {
 		return reinterpret_cast<const char*>(from);
 	}
-	static size_t rawsize(const wchar_t (&) [_N]) {
-		return (_N - 1) * sizeof(wchar_t);
+	static size_t rawsize(const wchar_t (&) [_ZCPN]) {
+		return (_ZCPN - 1) * sizeof(wchar_t);
 	}
 };
 
